Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 9 Jul 2010 01:50:09 +0000 (01:50 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 9 Jul 2010 01:50:09 +0000 (01:50 +0000)
commit50385319b04c74ee743643190804d5bad50e9646
tree4433fbb7b0fed62ee3212334d200c6143580c2d3
parenta885481e46364add097c7c5523176db5b87835ff
parente75391a438a1198a53e0eb93bc34ce6e0edf3dcf
Merge from mainline.